From 51fadaa0edd85af864d7384f2fd2b831fde8cb77 Mon Sep 17 00:00:00 2001
From: "awilliam@xenbuild.aw" <awilliam@xenbuild.aw>
Date: Sat, 3 Jun 2006 15:21:07 -0600
Subject: [PATCH] [IA64] Fix another bug which causes "Oops: time tick before
 it's due"

Signed-off-by: Anthony Xu < anthony.xu@intel.com >
---
 xen/arch/ia64/vmx/vlsapic.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xen/arch/ia64/vmx/vlsapic.c b/xen/arch/ia64/vmx/vlsapic.c
index 0f953f2e62..f0d5c45f84 100644
--- a/xen/arch/ia64/vmx/vlsapic.c
+++ b/xen/arch/ia64/vmx/vlsapic.c
@@ -39,6 +39,7 @@
 #include <asm/kregs.h>
 #include <asm/vmx_platform.h>
 #include <asm/hvm/vioapic.h>
+#include <asm/linux/jiffies.h>
 
 //u64  fire_itc;
 //u64  fire_itc2;
@@ -171,6 +172,8 @@ void vtm_set_itm(VCPU *vcpu, uint64_t val)
     clear_bit(ITV_VECTOR(vitv), &VCPU(vcpu, irr[0]));
     VCPU(vcpu,itm)=val;
     cur_itc =now_itc(vtm);
+    if(time_before(val, cur_itc))
+        val = cur_itc;
     if(val >  vtm->last_itc){
         expires = NOW() + cycle_to_ns(val-cur_itc) + TIMER_SLOP;
         set_timer(&vtm->vtm_timer, expires);
-- 
2.30.2